From 49c14d4312ee3fe7d0bc30a5a68fb8ad610722c1 Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Tue, 15 Jan 2008 14:24:05 +0000 Subject: [PATCH] xend: Remove hardcoded (and apparently unused) xend version. Signed-off-by: Jim Fehlig --- tools/python/xen/xend/XendNode.py | 8 +------- tools/python/xen/xend/server/SrvDaemon.py | 6 ------ 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/tools/python/xen/xend/XendNode.py b/tools/python/xen/xend/XendNode.py index 841403f71d..b0e3963232 100644 --- a/tools/python/xen/xend/XendNode.py +++ b/tools/python/xen/xend/XendNode.py @@ -377,13 +377,7 @@ class XendNode: def xen_version(self): info = self.xc.xeninfo() - try: - from xen import VERSION - info = {'Xen': '%(xen_major)d.%(xen_minor)d' % info, - 'Xend': VERSION} - except (ImportError, AttributeError): - info = {'Xen': '%(xen_major)d.%(xen_minor)d' % info, - 'Xend': '3.0.3'} + info = {'Xen': '%(xen_major)d.%(xen_minor)d' % info} # Add xend_config_format info.update(self.xendinfo_dict()) diff --git a/tools/python/xen/xend/server/SrvDaemon.py b/tools/python/xen/xend/server/SrvDaemon.py index a265aef906..225b901168 100644 --- a/tools/python/xen/xend/server/SrvDaemon.py +++ b/tools/python/xen/xend/server/SrvDaemon.py @@ -335,12 +335,6 @@ class Daemon: log.info("Xend changeset: %s.", xinfo['xen_changeset']) del xc - try: - from xen import VERSION - log.info("Xend version: %s", VERSION) - except ImportError: - log.info("Xend version: Unknown.") - relocate.listenRelocation() servers = SrvServer.create() servers.start(status) -- 2.30.2